Adwaita: progressbar sizing and progress component positioning

shrinked progressbars a bit and moved the progress component start
and end over the trough border.

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index d841b7ac18cce160f090a951b81e466dfe44a2b2..76ee270562d335a37215ea5df933139f05a51a81 100644 (file)
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -2398,8 +2398,22 @@ scale {
  *****************/
 
 progressbar {
+  // sizing
+  &.horizontal {
+    trough,
+    progress { min-height: 4px; } // FIXME: should be 6px, but looks like currently gtk+ consider borders
+  }
+
+  &.vertical {
+    trough,
+    progress { min-width: 4px; } // FIXME: should be 6px, but looks like currently gtk+ consider borders
+  }
+
+  &.horizontal progress { margin: 0 -1px; } // the progress node is positioned after the trough border
+  &.vertical progress { margin: -1px 0; }   // this moves it over it.
+
+
   // FIXME: insensitive state missing and some other state should be set probably
-  padding: 0;
   font-size: smaller;
   color: transparentize($fg_color, 0.6);
 

diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 149d7f66fc810c76db48a50ed33059f1099a9658..8bf804e43439037b527ce2bf4116ac77f0ba6397 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -3419,10 +3419,19 @@ scale {
  * Progress bars *
  *****************/
 progressbar {
-  padding: 0;
   font-size: smaller;
   color: rgba(238, 238, 236, 0.4);
   box-shadow: 0 1px rgba(238, 238, 236, 0); }
+  progressbar.horizontal trough,
+  progressbar.horizontal progress {
+    min-height: 4px; }
+  progressbar.vertical trough,
+  progressbar.vertical progress {
+    min-width: 4px; }
+  progressbar.horizontal progress {
+    margin: 0 -1px; }
+  progressbar.vertical progress {
+    margin: -1px 0; }
   progressbar:backdrop {
     box-shadow: none; }
   progressbar progress {

diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 6d012584a19bacdccd1f9fbdbba9c31383948bbe..7e1141aee8e7e7a481376b9f00e15a4a4241b1fe 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -3581,10 +3581,19 @@ scale {
  * Progress bars *
  *****************/
 progressbar {
-  padding: 0;
   font-size: smaller;
   color: rgba(46, 52, 54, 0.4);
   box-shadow: 0 1px rgba(255, 255, 255, 0); }
+  progressbar.horizontal trough,
+  progressbar.horizontal progress {
+    min-height: 4px; }
+  progressbar.vertical trough,
+  progressbar.vertical progress {
+    min-width: 4px; }
+  progressbar.horizontal progress {
+    margin: 0 -1px; }
+  progressbar.vertical progress {
+    margin: -1px 0; }
   progressbar:backdrop {
     box-shadow: none; }
   progressbar progress {